diff --git a/Android.bp b/Android.bp
index c9f7e86..edefe22 100644
--- a/Android.bp
+++ b/Android.bp
@@ -49,8 +49,8 @@
 }
 
 subdirs = [
-    "qcom/pd-mapper",
-    "qcom/qrtr",
-    "qcom/rmtfs",
-    "qcom/tqftpserv",
+    "shared/utils/pd-mapper",
+    "shared/utils/qrtr",
+    "shared/utils/rmtfs",
+    "shared/utils/tqftpserv",
 ]
diff --git a/db845c/device.mk b/db845c/device.mk
index 637cd0a..46bc452 100644
--- a/db845c/device.mk
+++ b/db845c/device.mk
@@ -35,8 +35,8 @@
 
 # Install scripts to set vendor.* properties
 PRODUCT_COPY_FILES += \
-    device/linaro/dragonboard/qcom/set_hw.sh:$(TARGET_COPY_OUT_VENDOR)/bin/set_hw.sh \
-    device/linaro/dragonboard/qcom/set_udc.sh:$(TARGET_COPY_OUT_VENDOR)/bin/set_udc.sh
+    device/linaro/dragonboard/shared/utils/set_hw.sh:$(TARGET_COPY_OUT_VENDOR)/bin/set_hw.sh \
+    device/linaro/dragonboard/shared/utils/set_udc.sh:$(TARGET_COPY_OUT_VENDOR)/bin/set_udc.sh
 
 # Install scripts to set Ethernet MAC address
 PRODUCT_COPY_FILES += \
diff --git a/full.mk b/full.mk
index e2fd3ee..66f6414 100644
--- a/full.mk
+++ b/full.mk
@@ -230,7 +230,7 @@
     tqftpserv
 
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/qcom/init.qcom.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qcom.rc
+    $(LOCAL_PATH)/shared/utils/init.utils.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.utils.rc
 
 # Copy standard platform config files
 PRODUCT_COPY_FILES +=  \
diff --git a/rb5/device.mk b/rb5/device.mk
index f0100cf..5aed224 100644
--- a/rb5/device.mk
+++ b/rb5/device.mk
@@ -35,7 +35,7 @@
 
 # Install scripts to set vendor.* properties
 PRODUCT_COPY_FILES += \
-    device/linaro/dragonboard/qcom/set_hw.sh:$(TARGET_COPY_OUT_VENDOR)/bin/set_hw.sh
+    device/linaro/dragonboard/shared/utils/set_hw.sh:$(TARGET_COPY_OUT_VENDOR)/bin/set_hw.sh
 
 PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Qualcomm
 PRODUCT_VENDOR_PROPERTIES += ro.soc.model=QRB5165
diff --git a/qcom/init.qcom.rc b/shared/utils/init.utils.rc
similarity index 100%
rename from qcom/init.qcom.rc
rename to shared/utils/init.utils.rc
diff --git a/qcom/pd-mapper/Android.bp b/shared/utils/pd-mapper/Android.bp
similarity index 100%
rename from qcom/pd-mapper/Android.bp
rename to shared/utils/pd-mapper/Android.bp
diff --git a/qcom/pd-mapper/LICENSE b/shared/utils/pd-mapper/LICENSE
similarity index 100%
rename from qcom/pd-mapper/LICENSE
rename to shared/utils/pd-mapper/LICENSE
diff --git a/qcom/pd-mapper/Makefile b/shared/utils/pd-mapper/Makefile
similarity index 100%
rename from qcom/pd-mapper/Makefile
rename to shared/utils/pd-mapper/Makefile
diff --git a/qcom/pd-mapper/assoc.c b/shared/utils/pd-mapper/assoc.c
similarity index 100%
rename from qcom/pd-mapper/assoc.c
rename to shared/utils/pd-mapper/assoc.c
diff --git a/qcom/pd-mapper/assoc.h b/shared/utils/pd-mapper/assoc.h
similarity index 100%
rename from qcom/pd-mapper/assoc.h
rename to shared/utils/pd-mapper/assoc.h
diff --git a/qcom/pd-mapper/json.c b/shared/utils/pd-mapper/json.c
similarity index 100%
rename from qcom/pd-mapper/json.c
rename to shared/utils/pd-mapper/json.c
diff --git a/qcom/pd-mapper/json.h b/shared/utils/pd-mapper/json.h
similarity index 100%
rename from qcom/pd-mapper/json.h
rename to shared/utils/pd-mapper/json.h
diff --git a/qcom/pd-mapper/pd-mapper.c b/shared/utils/pd-mapper/pd-mapper.c
similarity index 100%
rename from qcom/pd-mapper/pd-mapper.c
rename to shared/utils/pd-mapper/pd-mapper.c
diff --git a/qcom/pd-mapper/pd-mapper.service.in b/shared/utils/pd-mapper/pd-mapper.service.in
similarity index 100%
rename from qcom/pd-mapper/pd-mapper.service.in
rename to shared/utils/pd-mapper/pd-mapper.service.in
diff --git a/qcom/pd-mapper/servreg_loc.c b/shared/utils/pd-mapper/servreg_loc.c
similarity index 100%
rename from qcom/pd-mapper/servreg_loc.c
rename to shared/utils/pd-mapper/servreg_loc.c
diff --git a/qcom/pd-mapper/servreg_loc.h b/shared/utils/pd-mapper/servreg_loc.h
similarity index 100%
rename from qcom/pd-mapper/servreg_loc.h
rename to shared/utils/pd-mapper/servreg_loc.h
diff --git a/qcom/pd-mapper/servreg_loc.qmi b/shared/utils/pd-mapper/servreg_loc.qmi
similarity index 100%
rename from qcom/pd-mapper/servreg_loc.qmi
rename to shared/utils/pd-mapper/servreg_loc.qmi
diff --git a/qcom/qrtr/Android.bp b/shared/utils/qrtr/Android.bp
similarity index 100%
rename from qcom/qrtr/Android.bp
rename to shared/utils/qrtr/Android.bp
diff --git a/qcom/qrtr/LICENSE b/shared/utils/qrtr/LICENSE
similarity index 100%
rename from qcom/qrtr/LICENSE
rename to shared/utils/qrtr/LICENSE
diff --git a/qcom/qrtr/Makefile b/shared/utils/qrtr/Makefile
similarity index 100%
rename from qcom/qrtr/Makefile
rename to shared/utils/qrtr/Makefile
diff --git a/qcom/qrtr/lib/libqrtr.h b/shared/utils/qrtr/lib/libqrtr.h
similarity index 100%
rename from qcom/qrtr/lib/libqrtr.h
rename to shared/utils/qrtr/lib/libqrtr.h
diff --git a/qcom/qrtr/lib/logging.c b/shared/utils/qrtr/lib/logging.c
similarity index 100%
rename from qcom/qrtr/lib/logging.c
rename to shared/utils/qrtr/lib/logging.c
diff --git a/qcom/qrtr/lib/logging.h b/shared/utils/qrtr/lib/logging.h
similarity index 100%
rename from qcom/qrtr/lib/logging.h
rename to shared/utils/qrtr/lib/logging.h
diff --git a/qcom/qrtr/lib/qmi.c b/shared/utils/qrtr/lib/qmi.c
similarity index 100%
rename from qcom/qrtr/lib/qmi.c
rename to shared/utils/qrtr/lib/qmi.c
diff --git a/qcom/qrtr/lib/qrtr.c b/shared/utils/qrtr/lib/qrtr.c
similarity index 100%
rename from qcom/qrtr/lib/qrtr.c
rename to shared/utils/qrtr/lib/qrtr.c
diff --git a/qcom/qrtr/qrtr-ns.service.in b/shared/utils/qrtr/qrtr-ns.service.in
similarity index 100%
rename from qcom/qrtr/qrtr-ns.service.in
rename to shared/utils/qrtr/qrtr-ns.service.in
diff --git a/qcom/qrtr/qrtr.py b/shared/utils/qrtr/qrtr.py
similarity index 100%
rename from qcom/qrtr/qrtr.py
rename to shared/utils/qrtr/qrtr.py
diff --git a/qcom/qrtr/src/addr.c b/shared/utils/qrtr/src/addr.c
similarity index 100%
rename from qcom/qrtr/src/addr.c
rename to shared/utils/qrtr/src/addr.c
diff --git a/qcom/qrtr/src/addr.h b/shared/utils/qrtr/src/addr.h
similarity index 100%
rename from qcom/qrtr/src/addr.h
rename to shared/utils/qrtr/src/addr.h
diff --git a/qcom/qrtr/src/cfg.c b/shared/utils/qrtr/src/cfg.c
similarity index 100%
rename from qcom/qrtr/src/cfg.c
rename to shared/utils/qrtr/src/cfg.c
diff --git a/qcom/qrtr/src/hash.c b/shared/utils/qrtr/src/hash.c
similarity index 100%
rename from qcom/qrtr/src/hash.c
rename to shared/utils/qrtr/src/hash.c
diff --git a/qcom/qrtr/src/hash.h b/shared/utils/qrtr/src/hash.h
similarity index 100%
rename from qcom/qrtr/src/hash.h
rename to shared/utils/qrtr/src/hash.h
diff --git a/qcom/qrtr/src/list.h b/shared/utils/qrtr/src/list.h
similarity index 100%
rename from qcom/qrtr/src/list.h
rename to shared/utils/qrtr/src/list.h
diff --git a/qcom/qrtr/src/lookup.c b/shared/utils/qrtr/src/lookup.c
similarity index 100%
rename from qcom/qrtr/src/lookup.c
rename to shared/utils/qrtr/src/lookup.c
diff --git a/qcom/qrtr/src/map.c b/shared/utils/qrtr/src/map.c
similarity index 100%
rename from qcom/qrtr/src/map.c
rename to shared/utils/qrtr/src/map.c
diff --git a/qcom/qrtr/src/map.h b/shared/utils/qrtr/src/map.h
similarity index 100%
rename from qcom/qrtr/src/map.h
rename to shared/utils/qrtr/src/map.h
diff --git a/qcom/qrtr/src/ns.c b/shared/utils/qrtr/src/ns.c
similarity index 100%
rename from qcom/qrtr/src/ns.c
rename to shared/utils/qrtr/src/ns.c
diff --git a/qcom/qrtr/src/ns.h b/shared/utils/qrtr/src/ns.h
similarity index 100%
rename from qcom/qrtr/src/ns.h
rename to shared/utils/qrtr/src/ns.h
diff --git a/qcom/qrtr/src/util.c b/shared/utils/qrtr/src/util.c
similarity index 100%
rename from qcom/qrtr/src/util.c
rename to shared/utils/qrtr/src/util.c
diff --git a/qcom/qrtr/src/util.h b/shared/utils/qrtr/src/util.h
similarity index 100%
rename from qcom/qrtr/src/util.h
rename to shared/utils/qrtr/src/util.h
diff --git a/qcom/qrtr/src/waiter.c b/shared/utils/qrtr/src/waiter.c
similarity index 100%
rename from qcom/qrtr/src/waiter.c
rename to shared/utils/qrtr/src/waiter.c
diff --git a/qcom/qrtr/src/waiter.h b/shared/utils/qrtr/src/waiter.h
similarity index 100%
rename from qcom/qrtr/src/waiter.h
rename to shared/utils/qrtr/src/waiter.h
diff --git a/qcom/rmtfs/Android.bp b/shared/utils/rmtfs/Android.bp
similarity index 100%
rename from qcom/rmtfs/Android.bp
rename to shared/utils/rmtfs/Android.bp
diff --git a/qcom/rmtfs/LICENSE b/shared/utils/rmtfs/LICENSE
similarity index 100%
rename from qcom/rmtfs/LICENSE
rename to shared/utils/rmtfs/LICENSE
diff --git a/qcom/rmtfs/Makefile b/shared/utils/rmtfs/Makefile
similarity index 100%
rename from qcom/rmtfs/Makefile
rename to shared/utils/rmtfs/Makefile
diff --git a/qcom/rmtfs/qmi_rmtfs.c b/shared/utils/rmtfs/qmi_rmtfs.c
similarity index 100%
rename from qcom/rmtfs/qmi_rmtfs.c
rename to shared/utils/rmtfs/qmi_rmtfs.c
diff --git a/qcom/rmtfs/qmi_rmtfs.h b/shared/utils/rmtfs/qmi_rmtfs.h
similarity index 100%
rename from qcom/rmtfs/qmi_rmtfs.h
rename to shared/utils/rmtfs/qmi_rmtfs.h
diff --git a/qcom/rmtfs/qmi_rmtfs.qmi b/shared/utils/rmtfs/qmi_rmtfs.qmi
similarity index 100%
rename from qcom/rmtfs/qmi_rmtfs.qmi
rename to shared/utils/rmtfs/qmi_rmtfs.qmi
diff --git a/qcom/rmtfs/qmi_tlv.c b/shared/utils/rmtfs/qmi_tlv.c
similarity index 100%
rename from qcom/rmtfs/qmi_tlv.c
rename to shared/utils/rmtfs/qmi_tlv.c
diff --git a/qcom/rmtfs/rmtfs.c b/shared/utils/rmtfs/rmtfs.c
similarity index 100%
rename from qcom/rmtfs/rmtfs.c
rename to shared/utils/rmtfs/rmtfs.c
diff --git a/qcom/rmtfs/rmtfs.h b/shared/utils/rmtfs/rmtfs.h
similarity index 100%
rename from qcom/rmtfs/rmtfs.h
rename to shared/utils/rmtfs/rmtfs.h
diff --git a/qcom/rmtfs/rmtfs.service.in b/shared/utils/rmtfs/rmtfs.service.in
similarity index 100%
rename from qcom/rmtfs/rmtfs.service.in
rename to shared/utils/rmtfs/rmtfs.service.in
diff --git a/qcom/rmtfs/rproc.c b/shared/utils/rmtfs/rproc.c
similarity index 100%
rename from qcom/rmtfs/rproc.c
rename to shared/utils/rmtfs/rproc.c
diff --git a/qcom/rmtfs/sharedmem.c b/shared/utils/rmtfs/sharedmem.c
similarity index 100%
rename from qcom/rmtfs/sharedmem.c
rename to shared/utils/rmtfs/sharedmem.c
diff --git a/qcom/rmtfs/storage.c b/shared/utils/rmtfs/storage.c
similarity index 100%
rename from qcom/rmtfs/storage.c
rename to shared/utils/rmtfs/storage.c
diff --git a/qcom/rmtfs/util.c b/shared/utils/rmtfs/util.c
similarity index 100%
rename from qcom/rmtfs/util.c
rename to shared/utils/rmtfs/util.c
diff --git a/qcom/rmtfs/util.h b/shared/utils/rmtfs/util.h
similarity index 100%
rename from qcom/rmtfs/util.h
rename to shared/utils/rmtfs/util.h
diff --git a/qcom/set_hw.sh b/shared/utils/set_hw.sh
similarity index 100%
rename from qcom/set_hw.sh
rename to shared/utils/set_hw.sh
diff --git a/qcom/set_udc.sh b/shared/utils/set_udc.sh
similarity index 100%
rename from qcom/set_udc.sh
rename to shared/utils/set_udc.sh
diff --git a/qcom/tqftpserv/Android.bp b/shared/utils/tqftpserv/Android.bp
similarity index 100%
rename from qcom/tqftpserv/Android.bp
rename to shared/utils/tqftpserv/Android.bp
diff --git a/qcom/tqftpserv/LICENSE b/shared/utils/tqftpserv/LICENSE
similarity index 100%
rename from qcom/tqftpserv/LICENSE
rename to shared/utils/tqftpserv/LICENSE
diff --git a/qcom/tqftpserv/Makefile b/shared/utils/tqftpserv/Makefile
similarity index 100%
rename from qcom/tqftpserv/Makefile
rename to shared/utils/tqftpserv/Makefile
diff --git a/qcom/tqftpserv/list.h b/shared/utils/tqftpserv/list.h
similarity index 100%
rename from qcom/tqftpserv/list.h
rename to shared/utils/tqftpserv/list.h
diff --git a/qcom/tqftpserv/tqftpserv.c b/shared/utils/tqftpserv/tqftpserv.c
similarity index 100%
rename from qcom/tqftpserv/tqftpserv.c
rename to shared/utils/tqftpserv/tqftpserv.c
diff --git a/qcom/tqftpserv/tqftpserv.service.in b/shared/utils/tqftpserv/tqftpserv.service.in
similarity index 100%
rename from qcom/tqftpserv/tqftpserv.service.in
rename to shared/utils/tqftpserv/tqftpserv.service.in
diff --git a/qcom/tqftpserv/translate.c b/shared/utils/tqftpserv/translate.c
similarity index 100%
rename from qcom/tqftpserv/translate.c
rename to shared/utils/tqftpserv/translate.c
diff --git a/qcom/tqftpserv/translate.h b/shared/utils/tqftpserv/translate.h
similarity index 100%
rename from qcom/tqftpserv/translate.h
rename to shared/utils/tqftpserv/translate.h